bitkeeper revision 1.1159.170.9 (4194c9d7SVnKydQXKdEqJVKG3_Tx9g)

build under 2.4 again

diff --git a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c
index f09019436f68a47f99e1b6a2787a0d269254dee7..33840996412eba0995d4383eb251ab454c037a22 100644 (file)
--- a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c
+++ b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c
@@ -136,6 +136,7 @@ static inline void ADD_ID_TO_FREELIST( unsigned long id )
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #define DISABLE_SCATTERGATHER() 
 #else
+static int sg_operation = -1;
 #define DISABLE_SCATTERGATHER() (sg_operation = -1)
 #endif
 
@@ -497,7 +498,6 @@ static irqreturn_t blkif_int(int irq, void *dev_id, struct pt_regs *ptregs)
 /**************************  KERNEL VERSION 2.4  **************************/
 
 static kdev_t        sg_dev;
-static int           sg_operation = -1;
 static unsigned long sg_next_sect;
 
 /*